diff --git a/amp/src/ddl/comp_aout/aout_hdmi.c b/amp/src/ddl/comp_aout/aout_hdmi.c
index fd025c9..0f1f0e0 100644
--- a/amp/src/ddl/comp_aout/aout_hdmi.c
+++ b/amp/src/ddl/comp_aout/aout_hdmi.c
@@ -1132,8 +1132,9 @@ HRESULT Aout_SetHDMIPortFmt(HANDLE this_module, HDMI_DATA_CFG *pHdmiDataCfg, con
 #else
     if (pHdmiDataCfg->ucMode == HDMI_PCM_PRI
 #endif
-        && ppath->m_hdmi_cfg.ucMode == HDMI_RAW_MAIN)
-        bBitstream2pcm = TRUE;
+        && ppath->m_hdmi_cfg.ucMode == HDMI_RAW_MAIN){
+        bBitstream2pcm = FALSE;
+    }
 
     AmpMemcpy(&ppath->m_hdmi_cfg, pHdmiDataCfg, sizeof(HDMI_DATA_CFG));
     /* warning clear */
@@ -1411,8 +1412,9 @@ HRESULT Aout_SetHDMIPortFmt(HANDLE this_module, HDMI_DATA_CFG *pHdmiDataCfg, con
         return rc;
     }
 
-    if (bBitstream2pcm)
+    if (bBitstream2pcm) {
         Aout_WaitUnitlHDMIFormatDetectedBySink();
+    }
     return S_OK;
 }